Autogenerated HTML docs for v1.6.0.4-790-gaa14a
diff --git a/config.txt b/config.txt index d536732..220b937 100644 --- a/config.txt +++ b/config.txt
@@ -572,9 +572,6 @@ to red). The values of these variables may be specified as in color.branch.<slot>. -commit.template:: - Specify a file to use as the template for new commit messages. - color.ui:: When set to `always`, always use colors in all git commands which are capable of colored output. When false (or `never`), never. When @@ -582,6 +579,9 @@ terminal. When more specific variables of color.* are set, they always take precedence over this setting. Defaults to false. +commit.template:: + Specify a file to use as the template for new commit messages. + diff.autorefreshindex:: When using 'git-diff' to compare with work tree files, do not consider stat-only change as changed. @@ -714,18 +714,6 @@ kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. -rerere.autoupdate:: - When set to true, `git-rerere` updates the index with the - resulting contents after it cleanly resolves conflicts using - previously recorded resolution. Defaults to false. - -rerere.enabled:: - Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. linkgit:git-rerere[1] command is by - default enabled if you create `rr-cache` directory under - `$GIT_DIR`, but can be disabled by setting this option to false. - gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]. @@ -917,6 +905,10 @@ Character encoding the commit messages are converted to when running 'git-log' and friends. +imap:: + The configuration variables in the 'imap' section are described + in linkgit:git-imap-send[1]. + instaweb.browser:: Specify the program that will be used to browse your working repository in gitweb. See linkgit:git-instaweb[1]. @@ -952,8 +944,6 @@ Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. -include::merge-config.txt[] - man.<tool>.cmd:: Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page @@ -963,13 +953,7 @@ Override the path for the given tool that may be used to display help in the 'man' format. See linkgit:git-help[1]. -merge.conflictstyle:: - Specify the style in which conflicted hunks are written out to - working tree files upon merge. The default is "merge", which - shows `<<<<<<<` conflict marker, change made by one side, - `=======` marker, change made by the other side, and then - `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` - marker and the original text before `=======` marker. +include::merge-config.txt[] mergetool.<tool>.path:: Override the path for the given tool. This is useful in case @@ -1079,6 +1063,41 @@ pull.twohead:: The default merge strategy to use when pulling a single branch. +receive.fsckObjects:: + If it is set to true, git-receive-pack will check all received + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + Defaults to false. + +receive.unpackLimit:: + If the number of objects received in a push is below this + limit then the objects will be unpacked into loose object + files. However if the number of received objects equals or + exceeds this limit then the received pack will be stored as + a pack, after adding any missing delta bases. Storing the + pack from a push can make the push operation complete faster, + especially on slow filesystems. If not set, the value of + `transfer.unpackLimit` is used instead. + +receive.denyDeletes:: + If set to true, git-receive-pack will deny a ref update that deletes + the ref. Use this to prevent such a ref deletion via a push. + +receive.denyCurrentBranch:: + If set to true or "refuse", receive-pack will deny a ref update + to the currently checked out branch of a non-bare repository. + Such a push is potentially dangerous because it brings the HEAD + out of sync with the index and working tree. If set to "warn", + print a warning of such a push to stderr, but allow the push to + proceed. If set to false or "ignore", allow such pushes with no + message. Defaults to "warn". + +receive.denyNonFastForwards:: + If set to true, git-receive-pack will deny a ref update which is + not a fast forward. Use this to prevent such an update via a push, + even if that push is forced. This configuration variable is + set when initializing a shared repository. + remote.<name>.url:: The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-push[1]. @@ -1128,6 +1147,18 @@ "false" and repack. Access from old git versions over the native protocol are unaffected by this option. +rerere.autoupdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + +rerere.enabled:: + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they + be encountered again. linkgit:git-rerere[1] command is by + default enabled if you create `rr-cache` directory under + `$GIT_DIR`, but can be disabled by setting this option to false. + showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-show-branch[1]. @@ -1164,6 +1195,11 @@ archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]. +transfer.unpackLimit:: + When `fetch.unpackLimit` or `receive.unpackLimit` are + not set, the value of this variable is used instead. + The default value is 100. + url.<base>.insteadOf:: Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a @@ -1192,50 +1228,6 @@ unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports. -imap:: - The configuration variables in the 'imap' section are described - in linkgit:git-imap-send[1]. - -receive.fsckObjects:: - If it is set to true, git-receive-pack will check all received - objects. It will abort in the case of a malformed object or a - broken link. The result of an abort are only dangling objects. - Defaults to false. - -receive.unpackLimit:: - If the number of objects received in a push is below this - limit then the objects will be unpacked into loose object - files. However if the number of received objects equals or - exceeds this limit then the received pack will be stored as - a pack, after adding any missing delta bases. Storing the - pack from a push can make the push operation complete faster, - especially on slow filesystems. If not set, the value of - `transfer.unpackLimit` is used instead. - -receive.denyDeletes:: - If set to true, git-receive-pack will deny a ref update that deletes - the ref. Use this to prevent such a ref deletion via a push. - -receive.denyNonFastForwards:: - If set to true, git-receive-pack will deny a ref update which is - not a fast forward. Use this to prevent such an update via a push, - even if that push is forced. This configuration variable is - set when initializing a shared repository. - -receive.denyCurrentBranch:: - If set to true or "refuse", receive-pack will deny a ref update - to the currently checked out branch of a non-bare repository. - Such a push is potentially dangerous because it brings the HEAD - out of sync with the index and working tree. If set to "warn", - print a warning of such a push to stderr, but allow the push to - proceed. If set to false or "ignore", allow such pushes with no - message. Defaults to "warn". - -transfer.unpackLimit:: - When `fetch.unpackLimit` or `receive.unpackLimit` are - not set, the value of this variable is used instead. - The default value is 100. - web.browser:: Specify a web browser that may be used by some commands. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
diff --git a/git-config.html b/git-config.html index 31f7476..8451e2f 100644 --- a/git-config.html +++ b/git-config.html
@@ -1543,14 +1543,6 @@ </p> </dd> <dt> -commit.template -</dt> -<dd> -<p> - Specify a file to use as the template for new commit messages. -</p> -</dd> -<dt> color.ui </dt> <dd> @@ -1563,6 +1555,14 @@ </p> </dd> <dt> +commit.template +</dt> +<dd> +<p> + Specify a file to use as the template for new commit messages. +</p> +</dd> +<dt> diff.autorefreshindex </dt> <dd> @@ -1827,28 +1827,6 @@ </p> </dd> <dt> -rerere.autoupdate -</dt> -<dd> -<p> - When set to true, <tt>git-rerere</tt> updates the index with the - resulting contents after it cleanly resolves conflicts using - previously recorded resolution. Defaults to false. -</p> -</dd> -<dt> -rerere.enabled -</dt> -<dd> -<p> - Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. <a href="git-rerere.html">git-rerere(1)</a> command is by - default enabled if you create <tt>rr-cache</tt> directory under - <tt>$GIT_DIR</tt>, but can be disabled by setting this option to false. -</p> -</dd> -<dt> gitcvs.enabled </dt> <dd> @@ -2206,6 +2184,15 @@ </p> </dd> <dt> +imap +</dt> +<dd> +<p> + The configuration variables in the <em>imap</em> section are described + in <a href="git-imap-send.html">git-imap-send(1)</a>. +</p> +</dd> +<dt> instaweb.browser </dt> <dd> @@ -2281,12 +2268,35 @@ </p> </dd> <dt> -merge.stat +man.<tool>.cmd </dt> <dd> <p> - Whether to print the diffstat between ORIG_HEAD and the merge result - at the end of the merge. True by default. + Specify the command to invoke the specified man viewer. The + specified command is evaluated in shell with the man page + passed as argument. (See <a href="git-help.html">git-help(1)</a>.) +</p> +</dd> +<dt> +man.<tool>.path +</dt> +<dd> +<p> + Override the path for the given tool that may be used to + display help in the <em>man</em> format. See <a href="git-help.html">git-help(1)</a>. +</p> +</dd> +<dt> +merge.conflictstyle +</dt> +<dd> +<p> + Specify the style in which conflicted hunks are written out to + working tree files upon merge. The default is "merge", which + shows <tt><<<<<<<</tt> conflict marker, change made by one side, + <tt>=======</tt> marker, change made by the other side, and then + <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds <tt>|||||||</tt> + marker and the original text before <tt>=======</tt> marker. </p> </dd> <dt> @@ -2309,6 +2319,15 @@ </p> </dd> <dt> +merge.stat +</dt> +<dd> +<p> + Whether to print the diffstat between ORIG_HEAD and the merge result + at the end of the merge. True by default. +</p> +</dd> +<dt> merge.tool </dt> <dd> @@ -2362,38 +2381,6 @@ </p> </dd> <dt> -man.<tool>.cmd -</dt> -<dd> -<p> - Specify the command to invoke the specified man viewer. The - specified command is evaluated in shell with the man page - passed as argument. (See <a href="git-help.html">git-help(1)</a>.) -</p> -</dd> -<dt> -man.<tool>.path -</dt> -<dd> -<p> - Override the path for the given tool that may be used to - display help in the <em>man</em> format. See <a href="git-help.html">git-help(1)</a>. -</p> -</dd> -<dt> -merge.conflictstyle -</dt> -<dd> -<p> - Specify the style in which conflicted hunks are written out to - working tree files upon merge. The default is "merge", which - shows <tt><<<<<<<</tt> conflict marker, change made by one side, - <tt>=======</tt> marker, change made by the other side, and then - <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds <tt>|||||||</tt> - marker and the original text before <tt>=======</tt> marker. -</p> -</dd> -<dt> mergetool.<tool>.path </dt> <dd> @@ -2581,6 +2568,66 @@ </p> </dd> <dt> +receive.fsckObjects +</dt> +<dd> +<p> + If it is set to true, git-receive-pack will check all received + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + Defaults to false. +</p> +</dd> +<dt> +receive.unpackLimit +</dt> +<dd> +<p> + If the number of objects received in a push is below this + limit then the objects will be unpacked into loose object + files. However if the number of received objects equals or + exceeds this limit then the received pack will be stored as + a pack, after adding any missing delta bases. Storing the + pack from a push can make the push operation complete faster, + especially on slow filesystems. If not set, the value of + <tt>transfer.unpackLimit</tt> is used instead. +</p> +</dd> +<dt> +receive.denyDeletes +</dt> +<dd> +<p> + If set to true, git-receive-pack will deny a ref update that deletes + the ref. Use this to prevent such a ref deletion via a push. +</p> +</dd> +<dt> +receive.denyCurrentBranch +</dt> +<dd> +<p> + If set to true or "refuse", receive-pack will deny a ref update + to the currently checked out branch of a non-bare repository. + Such a push is potentially dangerous because it brings the HEAD + out of sync with the index and working tree. If set to "warn", + print a warning of such a push to stderr, but allow the push to + proceed. If set to false or "ignore", allow such pushes with no + message. Defaults to "warn". +</p> +</dd> +<dt> +receive.denyNonFastForwards +</dt> +<dd> +<p> + If set to true, git-receive-pack will deny a ref update which is + not a fast forward. Use this to prevent such an update via a push, + even if that push is forced. This configuration variable is + set when initializing a shared repository. +</p> +</dd> +<dt> remote.<name>.url </dt> <dd> @@ -2685,6 +2732,28 @@ </p> </dd> <dt> +rerere.autoupdate +</dt> +<dd> +<p> + When set to true, <tt>git-rerere</tt> updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. +</p> +</dd> +<dt> +rerere.enabled +</dt> +<dd> +<p> + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they + be encountered again. <a href="git-rerere.html">git-rerere(1)</a> command is by + default enabled if you create <tt>rr-cache</tt> directory under + <tt>$GIT_DIR</tt>, but can be disabled by setting this option to false. +</p> +</dd> +<dt> showbranch.default </dt> <dd> @@ -2751,6 +2820,16 @@ </p> </dd> <dt> +transfer.unpackLimit +</dt> +<dd> +<p> + When <tt>fetch.unpackLimit</tt> or <tt>receive.unpackLimit</tt> are + not set, the value of this variable is used instead. + The default value is 100. +</p> +</dd> +<dt> url.<base>.insteadOf </dt> <dd> @@ -2799,85 +2878,6 @@ </p> </dd> <dt> -imap -</dt> -<dd> -<p> - The configuration variables in the <em>imap</em> section are described - in <a href="git-imap-send.html">git-imap-send(1)</a>. -</p> -</dd> -<dt> -receive.fsckObjects -</dt> -<dd> -<p> - If it is set to true, git-receive-pack will check all received - objects. It will abort in the case of a malformed object or a - broken link. The result of an abort are only dangling objects. - Defaults to false. -</p> -</dd> -<dt> -receive.unpackLimit -</dt> -<dd> -<p> - If the number of objects received in a push is below this - limit then the objects will be unpacked into loose object - files. However if the number of received objects equals or - exceeds this limit then the received pack will be stored as - a pack, after adding any missing delta bases. Storing the - pack from a push can make the push operation complete faster, - especially on slow filesystems. If not set, the value of - <tt>transfer.unpackLimit</tt> is used instead. -</p> -</dd> -<dt> -receive.denyDeletes -</dt> -<dd> -<p> - If set to true, git-receive-pack will deny a ref update that deletes - the ref. Use this to prevent such a ref deletion via a push. -</p> -</dd> -<dt> -receive.denyNonFastForwards -</dt> -<dd> -<p> - If set to true, git-receive-pack will deny a ref update which is - not a fast forward. Use this to prevent such an update via a push, - even if that push is forced. This configuration variable is - set when initializing a shared repository. -</p> -</dd> -<dt> -receive.denyCurrentBranch -</dt> -<dd> -<p> - If set to true or "refuse", receive-pack will deny a ref update - to the currently checked out branch of a non-bare repository. - Such a push is potentially dangerous because it brings the HEAD - out of sync with the index and working tree. If set to "warn", - print a warning of such a push to stderr, but allow the push to - proceed. If set to false or "ignore", allow such pushes with no - message. Defaults to "warn". -</p> -</dd> -<dt> -transfer.unpackLimit -</dt> -<dd> -<p> - When <tt>fetch.unpackLimit</tt> or <tt>receive.unpackLimit</tt> are - not set, the value of this variable is used instead. - The default value is 100. -</p> -</dd> -<dt> web.browser </dt> <dd> @@ -2903,7 +2903,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-11-15 08:07:37 UTC +Last updated 2008-11-26 22:50:09 UTC </div> </div> </body>
diff --git a/git-merge.html b/git-merge.html index a8edda5..3e7ab1e 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -561,12 +561,16 @@ <div class="sectionbody"> <div class="vlist"><dl> <dt> -merge.stat +merge.conflictstyle </dt> <dd> <p> - Whether to print the diffstat between ORIG_HEAD and the merge result - at the end of the merge. True by default. + Specify the style in which conflicted hunks are written out to + working tree files upon merge. The default is "merge", which + shows <tt><<<<<<<</tt> conflict marker, change made by one side, + <tt>=======</tt> marker, change made by the other side, and then + <tt>>>>>>>></tt> marker. An alternate style, "diff3", adds <tt>|||||||</tt> + marker and the original text before <tt>=======</tt> marker. </p> </dd> <dt> @@ -589,6 +593,15 @@ </p> </dd> <dt> +merge.stat +</dt> +<dd> +<p> + Whether to print the diffstat between ORIG_HEAD and the merge result + at the end of the merge. True by default. +</p> +</dd> +<dt> merge.tool </dt> <dd> @@ -885,7 +898,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:42 UTC +Last updated 2008-11-26 22:50:09 UTC </div> </div> </body>
diff --git a/merge-config.txt b/merge-config.txt index c735788..86d5b26 100644 --- a/merge-config.txt +++ b/merge-config.txt
@@ -1,6 +1,10 @@ -merge.stat:: - Whether to print the diffstat between ORIG_HEAD and the merge result - at the end of the merge. True by default. +merge.conflictstyle:: + Specify the style in which conflicted hunks are written out to + working tree files upon merge. The default is "merge", which + shows `<<<<<<<` conflict marker, change made by one side, + `=======` marker, change made by the other side, and then + `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` + marker and the original text before `=======` marker. merge.log:: Whether to include summaries of merged commits in newly created @@ -11,6 +15,10 @@ during a merge; if not specified, defaults to the value of diff.renameLimit. +merge.stat:: + Whether to print the diffstat between ORIG_HEAD and the merge result + at the end of the merge. True by default. + merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
